Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 22:14:50 +0000 (14:14 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 22:14:50 +0000 (14:14 -0800)
commit06767143fa3c5b2a226ff77c50694c2d9c82d7a7
treeb60ee678e92300b2dd2fa6004cf0c0159766be50
parent8012d269734457c44fccda377d621b0d6cb90fdb
parentf018fe6ea6daae5ce2a8957c3bed2a72dafc0156
Merge from trunk.